Merged from apiedit_vodafone branch, r26236.